Move 'tips' column out of capabilities and into mainline doc.

diff --git a/gui/setup.iss b/gui/setup.iss
index f1e6d688786e71b5f781db967d32cf9b921d931a..3338ebdec6cd92f2630c0ef809b2a6a99ec088b9 100755 (executable)
--- a/gui/setup.iss
+++ b/gui/setup.iss
@@ -1,4 +1,4 @@
-; $Id: setup.iss,v 1.13 2010/01/17 02:27:20 robertl Exp $\r
+; $Id: setup.iss,v 1.14 2010/01/18 20:44:24 robertl Exp $\r
 ;\r
 ; NOTE: setup.iss is generated from setup.iss.in via autoconf.\r
 ; The generated setup.iss is checked in to help keep the version numbers\r

diff --git a/tools/mkcapabilities.in b/tools/mkcapabilities.in
index 00848db72206670d500d4b58ea2b56d0b25f6c84..5157a2a3444d530297a28d331499dcf9f9a31e23 100755 (executable)
--- a/tools/mkcapabilities.in
+++ b/tools/mkcapabilities.in
@@ -10,17 +10,6 @@ function getcap(type, cap, sname, lname) {
        print "<td class=\"c4\"> <a href=\"htmldoc-development/fmt_" sname ".html\">" sname "</a></td>"
        # This is bad...
        
-       printf "<td class=\"c4\">"
-       if (sname == "geo") {
-               printf "<a href=\"/tips/browser.html\">Yes</a>"
-       } else if (sname == "s_and_t") {
-               printf "<a href=\"/formats/s_and_t/Importing_into_Microsoft_Streets_and_Trips_2003.html\">[1]</a><a href=\"http://www.gpsbabel.org/formats/s_and_t/TripPlanning.html\">[2]</a>"
-       } else if (sname == "an1") {
-               printf "<a href=\"/formats/delorme-new-interstate\">Yes</a>"
-       }
-       print "</td>"
-
-
        for (i = 1; i <= 6; i++) {
                c = substr(cap, i, 1)
                printf "<td class=\"cap\">"

diff --git a/xmldoc/formats/an1.xml b/xmldoc/formats/an1.xml
index 96ee1443552b66f9aa215bd102e0b6640632ff43..b905357364180a281194dfd21db00942979ed63e 100644 (file)
--- a/xmldoc/formats/an1.xml
+++ b/xmldoc/formats/an1.xml
@@ -13,3 +13,7 @@ layers by doing something like this:
 In this case, the merged data will contain all of the
 properties of the original data.
 </para>
+
+<para>
+GPSBabel has a page describing <ulink url="/formats/delorme-new-interstate/">creating routable onramps in Street Atlas with GPSBabel</ulink>.
+</para>

diff --git a/xmldoc/formats/geo.xml b/xmldoc/formats/geo.xml
index 42c1b22a1bb335cb4cc594e93c68747204ecc642..f730600cd26f77760d6771260768fe0c2ec6f9c6 100644 (file)
--- a/xmldoc/formats/geo.xml
+++ b/xmldoc/formats/geo.xml
@@ -9,3 +9,6 @@ This is a simple XML-based format containing only very basic information
 about geocaches.  If you can use the <link linkend="fmt_gpx">GPX</link> 
 format instead, you should consider doing so as it is a much richer format.
 </para>
+<para>
+We have a separate page describing how to <ulink url="/tips/browser.html">send from Geocaching.com pages to GPS</ulink> 
+</para>

diff --git a/xmldoc/formats/s_and_t.xml b/xmldoc/formats/s_and_t.xml
index 2eb0956e1a8eb985cf6d080993ba25b372dc1519..2df63932601249486756172a7db29741bc45930e 100644 (file)
--- a/xmldoc/formats/s_and_t.xml
+++ b/xmldoc/formats/s_and_t.xml
@@ -5,8 +5,11 @@
 <ulink url="http://www.microsoft.com/streets/default.mspx"> Microsoft Streets and
 Trips</ulink>.  It's been exercised on versions from 2003 through 2008. Detailed
 instructions on how to use it, including preserving hyperlinks, are at
-<ulink url="http://www.gpsbabel.org/formats/s_and_t/Importing_into_Microsoft_Streets_and_Trips_2003.html">gpsbabel.org</ulink>
+<ulink url="/formats/s_and_t/Importing_into_Microsoft_Streets_and_Trips_2003.html">gpsbabel.org</ulink>
          </para>
+<para>
+       We have an additional page describing how to solve the <ulink url="/formats/s_and_t/TripPlanning.html">traveling salesman problem with Streets &amp; Trips</ulink> to efficiently optimize a trip with many stops, such as is often made by geocachers.
+</para>
        <para>
                This format has nothing to do with the <link linkend="fmt_msroute1"> .est/axe format</link> used by this program to store routes.
        </para>